From: tsteven4 Date: Tue, 30 Apr 2019 02:18:44 +0000 (-0600) Subject: Roll version number for release 1.6.0. X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~8^2^2 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=bafcabd6d6820cc88d431c722396b1e42edd8e6a;p=gpsbabel.git Roll version number for release 1.6.0. --- diff --git a/configure b/configure index ca9e4a72b..b0934ae45 100755 --- a/configure +++ b/configure @@ -2216,8 +2216,8 @@ DOCVERSION=1.6.0 # Increase GBBUILD for a new release (why? Where is this ever used?) # A: it's used by win32/gpsbabel.rc.in which is used by the setup program, -GBBUILD=29 -PACKAGE_RELEASE="-beta20190413" +GBBUILD=30 +# PACKAGE_RELEASE="-beta20190413" cat >>confdefs.h <<_ACEOF #define PACKAGE_RELEASE "$PACKAGE_RELEASE" diff --git a/configure.ac b/configure.ac index 8755403f5..ceaefd378 100644 --- a/configure.ac +++ b/configure.ac @@ -13,8 +13,8 @@ DOCVERSION=1.6.0 # Increase GBBUILD for a new release (why? Where is this ever used?) # A: it's used by win32/gpsbabel.rc.in which is used by the setup program, -GBBUILD=29 -PACKAGE_RELEASE="-beta20190413" +GBBUILD=30 +# PACKAGE_RELEASE="-beta20190413" AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.]) AC_SUBST(PACKAGE_RELEASE) diff --git a/gbversion.h b/gbversion.h index 0754c8e65..d72de410f 100644 --- a/gbversion.h +++ b/gbversion.h @@ -4,5 +4,5 @@ * * Isn't simplification via automation grand? */ -#define VERSION "1.6.0-beta20190413" +#define VERSION "1.6.0" #define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.6.0" diff --git a/gui/gpsbabelfe_de.qm b/gui/gpsbabelfe_de.qm index 5e3f99af9..a877e1891 100644 Binary files a/gui/gpsbabelfe_de.qm and b/gui/gpsbabelfe_de.qm differ diff --git a/gui/gpsbabelfe_de.ts b/gui/gpsbabelfe_de.ts index fb64a61b1..6f6f856c7 100644 --- a/gui/gpsbabelfe_de.ts +++ b/gui/gpsbabelfe_de.ts @@ -900,29 +900,29 @@ Das Prgramm muss abgebrochen werden. MiscFltWidget - + + - + - Tracks Tracks - - + + + - - + Waypoints Wegpunkte - + + - Routes Routen @@ -933,23 +933,28 @@ Das Prgramm muss abgebrochen werden. Maske - + Misc. Filters verschiedene Filter - + Nuke (Remove) Data Types Bestimmte Datentypen löschen - + + Sort Routes + + + + Convert routes, waypoints and tracks to different types. no sentence Konvertierung zwischen Routen, Wegpunkten und Tracks. - + This filter can be used to convert GPS data between different data types. Some GPS data formats support only some subset of waypoints, tracks, and routes. The transform filter allows you to convert between these types. For example, it can be used to convert a pile of waypoints (such as those from a CSV file) into a track or vice versa. @@ -958,43 +963,90 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes. Manche Dateiformate unterstuetzen nur eine Teilmenge, entweder Wegpunkte oder Tracks oder Routen. Der Transformationsfilter erlaubt die Konvertierung in andere Typen. Zum Beispiel kann er verwendet werden, um Wegpunkte (wie in einer CSV-Datei) in einen Track umzuwandeln oder umgekehrt. - + Transform Konvertieren - + Type of transformation. no sentence Art der Konvertierung. - + Delete original data after transform to prevent duplicated data. no sentence Vermeiden von redundanten Daten: löschen der Originaldaten. - + Delete Löschen - + + + + By + + + + + + + Description + + + + + GCID + + + + + + + Name + + + + + Time + + + + + Sort Waypoints + + + + + + Number + + + + Swap Longitude and Latitudes for badly formatted data formats. no sentence Vertauschen von Länge und Breite, für fehlerhafte Datenformate. - + Simple filter to swap the coordinate values (latitude and longitude) of all points. This can be helpful for wrong defined/coded data. Or if you think, you can use one of our xcsv formats, but latitude and longitude are in opposite order. Einfacher Filter, um die Koordinaten ( Länge und Breite ) aller Punkte zu vertauschen. Das kann hilfreich sein bei fehlerhaft geschriebenen Daten.Oder in Fällen wo die Verwendung eines xcsv-Formats sinnvoll erscheint aber Länge und Breite in umgekehrter Reihenfolge vorliegen. - + Swap Coordinates Koordinaten Vertauschen + + + Sort Tracks + + OptionsDlg @@ -1563,44 +1615,44 @@ Diese Option generiert für jeden Trackpunkt einen Geschwindigkeitswert. Sie wir UpgradeCheck - - - + + + HTTP HTTP - + Unexpected reply. - + Download failed: %1. Download fehlgeschlagen: %1. - + Download failed: %1: %2. - + Error - + Invalid return data at line %1: %2. - + A new version of GPSBabel is available.<br />Your version is %1 <br />The latest version is %2 Eine neue Version von GPSBabel ist verfügbar.<br />Die installierte Version ist %1 <br />Die neueste Version ist %2 - + Do you wish to download an upgrade? Möchten Sie die Aktualisierung herunter laden? @@ -1609,7 +1661,7 @@ Diese Option generiert für jeden Trackpunkt einen Geschwindigkeitswert. Sie wir <center><b>Eine neue GPSBabel-Version ist verf&uumlgbar</b><br>Die Version auf diesem Computer ist %1 <br>Die neueste Version ist %2</center> - + Upgrade Update @@ -1650,33 +1702,33 @@ Diese Option generiert für jeden Trackpunkt einen Geschwindigkeitswert. Sie wir Maske - + Waypoints Filters Wegpunktfilter - + Remove duplicates Duplikate beseitigen - + The duplicate filter is designed to remove duplicate points based on their short name (traditionally a waypoint's name on the GPS receiver), and/or their location (to a precision of 6 decimals). This filter supports two options that specify how duplicates will be recognized, shortname and location. Generally, at least one of these options is required. Der Duplikatfilter dient dazu, identische Punkte basierend auf ihrem Kurznamen (meist der Name des Punkt im GPS-Empfänger) und/oder ihrerPosition (bis auf eine Genauigkeit von 6 Nachkommastellen) zu beseitigen. Dieser Filter kennt zwei Varianten, nach denen sich die Art der Filterung richtet: 'Kurzname' und 'Position'. Mindestens eine dieser Varianten wird benötigt. - + Duplicates Duplikate - + Suppress duplicate waypoints based on name. no sentence Unterdrücken gleichnamiger Wegpunkte - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1692,17 +1744,17 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Diese Option ist die am häufigsten in Verbindung mit dem Duplikatfilter genutzte Variante. Sie steuert den Duplikatfilter so, dass dieser Wegpunkte entfernt, die einen gemeinsamen Kurznamen mit einem früher aufgetretenen Wegpunkt teilen. Die Option kann nützlich sein, wenn Duplikate entfernt werden sollen, die aus zwei unabhängigen Datenblöcken stammen, die aufbauend auf einem gemeinsamen Vorgaenger-Datenblock erzeugt wurden. </p></body></html> - + Short Names Kurzname - + Suppress duplicate waypoint based on coords. Unterdrücken von Wegpunkten mit gleichen Koordinaten - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1718,17 +1770,17 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Diese Option steuert den Duplikatfilter so, dass er alle zusätzlichen Wegpunkte entfernt, die (auf sechs Dezimalstellen) die gleichen Koordinaten haben wie der vorhergehende. Die Option kann Verwendung finden beim Entfernen doppelter Wegpunkte, wenn ihre Namen voneinander abweichen. Sie kann ebenfalls mit der <span style=" font-family:'Courier New,courier';">Kurzname</span>-Option kombiniert werden, die doppelte Wegpunkte entfernt, wenn diese zu unabhängigen Gruppen gehören, deren Namen aber übereinstimmen. </p></body></html> - + Locations Positionen - + Remove points based on proximity Beseitigen von Punkten auf Basis ihrer Nähe - + Maximum positional distance. This option specifies the minimum allowable distance between two points. If two points are closer than this distance, only one of them is kept. @@ -1737,32 +1789,32 @@ This option specifies the minimum allowable distance between two points. If two Diese Option definiert den örtlichen mindestabstand zwischen den Punkten. Wenn zwei Punkte näher beieinander liegen als dieser Wert, wird einer davon entfernt. - + Position Position - + Maximum positional distance. Maximale Entfernung - + Feet Fuβ - + Meters Meter - + Include points only within radius Übernahme von Punkten innerhalb eines Radius' - + This filter includes or excludes waypoints based on their proximity to a central point. All waypoints more than the specified distance from the specified point will be removed from the dataset. By default, all remaining points are sorted so that points closer to the center appear earlier in the output file. @@ -1771,56 +1823,53 @@ By default, all remaining points are sorted so that points closer to the center Voreinstellung ist, dass die übrig gebliebenen Punkte nach ihrer Entfernung vom Zentrum sortiert werden. Sie erscheinen dann in dieser Reihenfolge in der Ergebnisdatei. - + Radius Radius - + Maximum distance from center. no sentence Maximale Entfernung vom Zentrum - + Miles Meilen - + km km - + Lat. Breite - + Latitude of the central point in decimal degrees. South latitudes should be expressed as a negative number. Breitengrad des zentralen Punktes in Dezimalgraden. Südliche Breiten werden als negative Zahlen angegeben. - + Long. Länge - + Longitude of the central point in decimal degrees. West longitudes should be expressed as a negative number. Längengrad des zentralen Punktes in Dezimalgraden. Westliche Längen werden als negative Zahlen angegeben. - - This filter sorts waypoints into alphabetical order - Dieser Filter sortiert Wegpunkte alphabetisch + Dieser Filter sortiert Wegpunkte alphabetisch - Sort - Sortieren + Sortieren diff --git a/gui/gpsbabelfe_es.qm b/gui/gpsbabelfe_es.qm index deef31722..f23a78d48 100644 Binary files a/gui/gpsbabelfe_es.qm and b/gui/gpsbabelfe_es.qm differ diff --git a/gui/gpsbabelfe_es.ts b/gui/gpsbabelfe_es.ts index a21c02c90..a646d9045 100644 --- a/gui/gpsbabelfe_es.ts +++ b/gui/gpsbabelfe_es.ts @@ -927,29 +927,29 @@ This program cannot continue. MiscFltWidget - + + - + - Tracks Trazados - - + + + - - + Waypoints Puntos de interés - + + - Routes Rutas @@ -959,23 +959,28 @@ This program cannot continue. Formulario - + Misc. Filters Otros filtros - + Nuke (Remove) Data Types Espero que sea la traducción correcta (ADC) Borrar todo tipo de datos - + + Sort Routes + + + + Convert routes, waypoints and tracks to different types. Convertir rutas, puntos de interés y trazados a diferentes tipos. - + This filter can be used to convert GPS data between different data types. Some GPS data formats support only some subset of waypoints, tracks, and routes. The transform filter allows you to convert between these types. For example, it can be used to convert a pile of waypoints (such as those from a CSV file) into a track or vice versa. @@ -984,40 +989,87 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes. Algunos formatos de datos de los GPS solo permiten utilizar una parte de los puntos de interés, trazados o rutas. El filtro de transformación habilita la conversión entres esos tipos. Por ejemplo, se puede usar para convertir un conjunto de puntos de interés (como los contenidos en un fichero CSV) a un trazado o viceversa. - + Transform Transformar - + Type of transformation. Tipos de transformación. - + Delete original data after transform to prevent duplicated data. Borrar los datos originales después de la transaformación para evitar la duplicación de los mismos. - + Delete Borrar - + + + + By + + + + + + + Description + + + + + GCID + + + + + + + Name + + + + + Time + + + + + Sort Waypoints + + + + + + Number + + + + Swap Longitude and Latitudes for badly formatted data formats. Cambiar longitud y latitud en los formatos erróneos. - + Simple filter to swap the coordinate values (latitude and longitude) of all points. This can be helpful for wrong defined/coded data. Or if you think, you can use one of our xcsv formats, but latitude and longitude are in opposite order. Filtro simple para cambiar entre los valores de las coordenadas (latitud y longitud) de todos los puntos. Esto puede ser útil si los datos están mal definidos o si piensas que algún formato xcsv te puede ser útil pero la longitud y la latitud están en un orden incorrecto. - + Swap Coordinates Cambia longitud a latitud (y al revés) + + + Sort Tracks + + OptionsDlg @@ -1567,44 +1619,44 @@ Esta opción calcula (o recalcula) un valor para la velocidad de cada punto del UpgradeCheck - - - + + + HTTP HTTP - + Unexpected reply. - + Download failed: %1. La descarga falló: %1. - + Download failed: %1: %2. - + Error Error - + Invalid return data at line %1: %2. Ha devuelto datos no válidos en la línea %1: %2. - + A new version of GPSBabel is available.<br />Your version is %1 <br />The latest version is %2 Una nueva versióon de GPSBabel ha salido ya. <br />Tu versión es la %1 <br />La última versióon sería %2 - + Do you wish to download an upgrade? ¿Quieres bajarte una actualización? @@ -1613,7 +1665,7 @@ Esta opción calcula (o recalcula) un valor para la velocidad de cada punto del <center><b>Una nueva versión de GPSBabel está disponible </b><br>La versión actual es %1 <br> La versión más reciente es %2</center> - + Upgrade Actualizar @@ -1654,32 +1706,32 @@ Esta opción calcula (o recalcula) un valor para la velocidad de cada punto del Formulario - + Waypoints Filters Filtros para puntos de interés - + Remove duplicates Borrar duplicados - + The duplicate filter is designed to remove duplicate points based on their short name (traditionally a waypoint's name on the GPS receiver), and/or their location (to a precision of 6 decimals). This filter supports two options that specify how duplicates will be recognized, shortname and location. Generally, at least one of these options is required. El filtro duplicados está designado para borrar los puntos duplicados basándose en el nombre corto (normalmente el nombre del punto de interés en el receptor GPS), y su localización (hasta una precisión de seis decimales). El filtro permite dos opciones para designar como serán tratados los duplicados, por nombre corto y localización. Normalmente, al menos una de esas opciones es requerida. - + Duplicates Duplicados - + Suppress duplicate waypoints based on name. Suprimir duplicados con nombres idénticos. - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1694,17 +1746,17 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Esta opción es una de la más usadas con el filtro de duplicados. La opción instruye al filtro para que borre los puntos que tienen el mismo nombre que uno ya procesado. La opcion puede usarse para borrar puntos cuando se unen dos conjuntos de datos que vienen de una fuente parcialmente común. </p></body></html> - + Short Names Nombres cortos - + Suppress duplicate waypoint based on coords. Suprimir los puntos de interés que comparten coordenadas. - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1719,17 +1771,17 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Esta opción es una de la más usadas con el filtro de duplicados. La opción instruye al filtro para que borre los puntos que tienen coordenadas idénticas a uno ya procesado. La opcion puede usarse para borrar puntos que se sabe no tienen el mismo nombre pero si la misma localización. <span style=" font-family:'Courier New,courier';">nombre corto</span>. </p></body></html> - + Locations Lugares - + Remove points based on proximity Borrar puntos próximos - + Maximum positional distance. This option specifies the minimum allowable distance between two points. If two points are closer than this distance, only one of them is kept. @@ -1739,32 +1791,32 @@ This option specifies the minimum allowable distance between two points. If two Esta opción especifica la distancia máxima permitidad entre dos puntos. Si dos puntos están más alejados que la distancia dada un nuevo punto es creado. - + Position Posición - + Maximum positional distance. Distancia máxima permitida. - + Feet Pies - + Meters Metros - + Include points only within radius Incluir sólo puntos dentro de un radio determinado - + This filter includes or excludes waypoints based on their proximity to a central point. All waypoints more than the specified distance from the specified point will be removed from the dataset. By default, all remaining points are sorted so that points closer to the center appear earlier in the output file. @@ -1773,55 +1825,52 @@ By default, all remaining points are sorted so that points closer to the center Por defecto, los puntos restantes se ordenan de acuerdo con su distancia al centro, el más cercano será el primero. - + Radius Radio - + Maximum distance from center. Máxima distancia desde el centro. - + Miles Millas - + km Km - + Lat. Lat. - + Latitude of the central point in decimal degrees. South latitudes should be expressed as a negative number. Latitud del punto central en grados decimales. Las latitudes Sur deben ser número negativos. - + Long. Long. - + Longitude of the central point in decimal degrees. West longitudes should be expressed as a negative number. Longitud del punto central en grados decimales. Las longitudes Oeste deben ser número negativos. - - This filter sorts waypoints into alphabetical order - Este filtro ordena los puntos de interés en orden alfabético + Este filtro ordena los puntos de interés en orden alfabético - Sort - Ordenar + Ordenar diff --git a/gui/gpsbabelfe_fr.ts b/gui/gpsbabelfe_fr.ts index 4c3c1816f..a592d06ef 100644 --- a/gui/gpsbabelfe_fr.ts +++ b/gui/gpsbabelfe_fr.ts @@ -850,29 +850,29 @@ This program cannot continue. MiscFltWidget - + + - + - Tracks Traces - - + + + - - + Waypoints Waypoints - + + - Routes Routes @@ -882,62 +882,114 @@ This program cannot continue. - + Misc. Filters - + Nuke (Remove) Data Types - + + Sort Routes + + + + Convert routes, waypoints and tracks to different types. - + This filter can be used to convert GPS data between different data types. Some GPS data formats support only some subset of waypoints, tracks, and routes. The transform filter allows you to convert between these types. For example, it can be used to convert a pile of waypoints (such as those from a CSV file) into a track or vice versa. - + Transform - + Type of transformation. - + Delete original data after transform to prevent duplicated data. - + Delete - + + + + By + + + + + + + Description + + + + + GCID + + + + + + + Name + + + + + Time + + + + + Sort Waypoints + + + + + + Number + + + + Swap Longitude and Latitudes for badly formatted data formats. - + Simple filter to swap the coordinate values (latitude and longitude) of all points. This can be helpful for wrong defined/coded data. Or if you think, you can use one of our xcsv formats, but latitude and longitude are in opposite order. - + Swap Coordinates + + + Sort Tracks + + OptionsDlg @@ -1428,49 +1480,49 @@ This option computes a value for the GPS speed at each trackpoint. This is most UpgradeCheck - - - + + + HTTP - + Unexpected reply. - + Download failed: %1. - + Download failed: %1: %2. - + Error - + Invalid return data at line %1: %2. - + A new version of GPSBabel is available.<br />Your version is %1 <br />The latest version is %2 - + Do you wish to download an upgrade? - + Upgrade @@ -1511,32 +1563,32 @@ This option computes a value for the GPS speed at each trackpoint. This is most - + Waypoints Filters - + Remove duplicates - + The duplicate filter is designed to remove duplicate points based on their short name (traditionally a waypoint's name on the GPS receiver), and/or their location (to a precision of 6 decimals). This filter supports two options that specify how duplicates will be recognized, shortname and location. Generally, at least one of these options is required. - + Duplicates - + Suppress duplicate waypoints based on name. - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1546,17 +1598,17 @@ p, li { white-space: pre-wrap; } - + Short Names - + Suppress duplicate waypoint based on coords. - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1566,104 +1618,93 @@ p, li { white-space: pre-wrap; } - + Locations - + Remove points based on proximity - + Maximum positional distance. This option specifies the minimum allowable distance between two points. If two points are closer than this distance, only one of them is kept. - + Position - + Maximum positional distance. - + Feet - + Meters - + Include points only within radius - + This filter includes or excludes waypoints based on their proximity to a central point. All waypoints more than the specified distance from the specified point will be removed from the dataset. By default, all remaining points are sorted so that points closer to the center appear earlier in the output file. - + Radius - + Maximum distance from center. - + Miles - + km - + Lat. - + Latitude of the central point in decimal degrees. South latitudes should be expressed as a negative number. - + Long. - + Longitude of the central point in decimal degrees. West longitudes should be expressed as a negative number. - - - - This filter sorts waypoints into alphabetical order - - - - - Sort - - diff --git a/gui/gpsbabelfe_hu.ts b/gui/gpsbabelfe_hu.ts index c8d621253..c05828cb0 100644 --- a/gui/gpsbabelfe_hu.ts +++ b/gui/gpsbabelfe_hu.ts @@ -845,29 +845,29 @@ This program cannot continue. MiscFltWidget - + + - + - Tracks Nyomvonalak - - + + + - - + Waypoints Útpontok - + + - Routes Útvonalak @@ -877,62 +877,114 @@ This program cannot continue. - + Misc. Filters - + Nuke (Remove) Data Types - + + Sort Routes + + + + Convert routes, waypoints and tracks to different types. - + This filter can be used to convert GPS data between different data types. Some GPS data formats support only some subset of waypoints, tracks, and routes. The transform filter allows you to convert between these types. For example, it can be used to convert a pile of waypoints (such as those from a CSV file) into a track or vice versa. - + Transform - + Type of transformation. - + Delete original data after transform to prevent duplicated data. - + Delete - + + + + By + + + + + + + Description + + + + + GCID + + + + + + + Name + + + + + Time + + + + + Sort Waypoints + + + + + + Number + + + + Swap Longitude and Latitudes for badly formatted data formats. - + Simple filter to swap the coordinate values (latitude and longitude) of all points. This can be helpful for wrong defined/coded data. Or if you think, you can use one of our xcsv formats, but latitude and longitude are in opposite order. - + Swap Coordinates + + + Sort Tracks + + OptionsDlg @@ -1423,49 +1475,49 @@ This option computes a value for the GPS speed at each trackpoint. This is most UpgradeCheck - - - + + + HTTP - + Unexpected reply. - + Download failed: %1. - + Download failed: %1: %2. - + Error - + Invalid return data at line %1: %2. - + A new version of GPSBabel is available.<br />Your version is %1 <br />The latest version is %2 - + Do you wish to download an upgrade? - + Upgrade @@ -1506,32 +1558,32 @@ This option computes a value for the GPS speed at each trackpoint. This is most - + Waypoints Filters - + Remove duplicates - + The duplicate filter is designed to remove duplicate points based on their short name (traditionally a waypoint's name on the GPS receiver), and/or their location (to a precision of 6 decimals). This filter supports two options that specify how duplicates will be recognized, shortname and location. Generally, at least one of these options is required. - + Duplicates - + Suppress duplicate waypoints based on name. - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1541,17 +1593,17 @@ p, li { white-space: pre-wrap; } - + Short Names - + Suppress duplicate waypoint based on coords. - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1561,104 +1613,93 @@ p, li { white-space: pre-wrap; } - + Locations - + Remove points based on proximity - + Maximum positional distance. This option specifies the minimum allowable distance between two points. If two points are closer than this distance, only one of them is kept. - + Position - + Maximum positional distance. - + Feet - + Meters - + Include points only within radius - + This filter includes or excludes waypoints based on their proximity to a central point. All waypoints more than the specified distance from the specified point will be removed from the dataset. By default, all remaining points are sorted so that points closer to the center appear earlier in the output file. - + Radius - + Maximum distance from center. - + Miles - + km - + Lat. - + Latitude of the central point in decimal degrees. South latitudes should be expressed as a negative number. - + Long. - + Longitude of the central point in decimal degrees. West longitudes should be expressed as a negative number. - - - - This filter sorts waypoints into alphabetical order - - - - - Sort - - diff --git a/gui/gpsbabelfe_it.qm b/gui/gpsbabelfe_it.qm index fc253d92f..04b8d8ae3 100644 Binary files a/gui/gpsbabelfe_it.qm and b/gui/gpsbabelfe_it.qm differ diff --git a/gui/gpsbabelfe_it.ts b/gui/gpsbabelfe_it.ts index b7994c92f..81e9e8145 100644 --- a/gui/gpsbabelfe_it.ts +++ b/gui/gpsbabelfe_it.ts @@ -858,49 +858,54 @@ Questo programma non può proseguire. Modulo - + Misc. Filters Filtri vari - + Nuke (Remove) Data Types Rimuovi tipi di dati - + + - Routes Rotte - + + - + - Tracks Tracce - - + + + - - + Waypoints Punti di interesse - + Convert routes, waypoints and tracks to different types. Converti rotte, punti di interesse e tracce in tipi differenti. - + + Sort Routes + + + + This filter can be used to convert GPS data between different data types. Some GPS data formats support only some subset of waypoints, tracks, and routes. The transform filter allows you to convert between these types. For example, it can be used to convert a pile of waypoints (such as those from a CSV file) into a track or vice versa. @@ -909,40 +914,87 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes. Qualche formato di dati del GPS supporta solo un sottoinsieme di punti di interesse, tracce e rotte. Il filtro di trasformazione permette la conversione tra questi tipi. Per esempio, può essere usato per convertire un insieme di punti di interesse (per esempio da un file CSV) in una traccia (o viceversa). - + Transform Trasforma - + Type of transformation. Tipo di trasformazione. - + Delete original data after transform to prevent duplicated data. Elimina i dati originali dopo la trasformazione per evitare dati duplicati. - + Delete Elimina - + + + + By + + + + + + + Description + + + + + GCID + + + + + + + Name + + + + + Time + + + + + Sort Waypoints + + + + + + Number + + + + Swap Longitude and Latitudes for badly formatted data formats. Scambia longitudine e latitudine per i formati di data malformati. - + Simple filter to swap the coordinate values (latitude and longitude) of all points. This can be helpful for wrong defined/coded data. Or if you think, you can use one of our xcsv formats, but latitude and longitude are in opposite order. Semplice filtro per scambiare i valori delle coordinate (latitudine e longitudine) di tutti i punti. Può essere utile nel caso di dati malformati. O, se preferisci, puoi usare uno dei nostri formati xcsv, ma latitudine e longitudine sono scambiate. - + Swap Coordinates Scambia le coordinate + + + Sort Tracks + + OptionsDlg @@ -1461,49 +1513,49 @@ Questa opzione calcola (o ricalcola) un valore per la direzione del GPS in ogni UpgradeCheck - - - + + + HTTP HTTP - + Unexpected reply. - + Download failed: %1. Scaricamento non riuscito: %1. - + Download failed: %1: %2. - + Error Errore - + Invalid return data at line %1: %2. Dati ricevuti non validi alla linea %1: %2. - + A new version of GPSBabel is available.<br />Your version is %1 <br />The latest version is %2 È disponibile una nuova versione di GPSBabel.<br />Versione corrente: %1 <br />Nuova versione: %2 - + Upgrade Aggiorna - + Do you wish to download an upgrade? Si desidera scaricare un aggiornamento? @@ -1544,32 +1596,32 @@ Questa opzione calcola (o ricalcola) un valore per la direzione del GPS in ogni Modulo - + Waypoints Filters Filtri dei punti di interesse - + Remove duplicates Rimuovi i duplicati - + The duplicate filter is designed to remove duplicate points based on their short name (traditionally a waypoint's name on the GPS receiver), and/or their location (to a precision of 6 decimals). This filter supports two options that specify how duplicates will be recognized, shortname and location. Generally, at least one of these options is required. Il filtro dei duplicati è studiato per rimuovere i punti duplicati in base al loro nome breve (tipicamente un nome del punto di interesse sul ricevitore GPS), e/o in base alla posizione (con una precisione di 6 decimali). Questo filtro supporta due opzioni che indicano come individuare i duplicati, nome breve e posizione. In genere è necessario specificare almeno una di queste opzioni. - + Duplicates Duplicati - + Suppress duplicate waypoints based on name. Rimuovi i punti di interesse in base al nome. - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1584,17 +1636,17 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Questa opzione è la più usata col filtro dei duplicati. Indica al filtro dei duplicaati di rimuovere qualsiasi punto di interesse con un nome breve condiviso con un puntio di interesse già analizzato. Questa opzione può essere usata per rimuovere i duplicati se stai unendo due serie di dati che sono state create partendo dalla stessa una serie di dati iniziale. </p></body></html> - + Short Names Nomi brevi - + Suppress duplicate waypoint based on coords. Rimuovi i punti di interesse in base alle coordinate. - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1609,17 +1661,17 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Questa opzione fa sì che il filtro dei duplicati rimuova ogni ulteriore punto di interesse avente le stesse coordinate (con una precisione di sei cifre decimali). Questa opzione può essere usata per rimuovere punti di interesse duplicati anche quando i nomi non coincidono. Puà essere usata anche congiuntamente all'opzione <span style=" font-family:'Courier New,courier';">bomi brevi</span> per rimuovere punti di interesse se i nomi di diversi gruppi indipendenti di punti di interesse potrebbero coincidere. </p></body></html> - + Locations Posizioni - + Remove points based on proximity Rimuovi i punti in base alla vicinanza - + Maximum positional distance. This option specifies the minimum allowable distance between two points. If two points are closer than this distance, only one of them is kept. @@ -1628,32 +1680,32 @@ This option specifies the minimum allowable distance between two points. If two Questa opzione specifica la distanza minima consentita tra due punti. Se due punti sono più vicini di questa distanza, solo uno di essi viene mantenuto. - + Position Posizione - + Maximum positional distance. Massima distanza di posizione. - + Feet Piedi - + Meters Metri - + Include points only within radius Includi punto solo entro una distanza - + This filter includes or excludes waypoints based on their proximity to a central point. All waypoints more than the specified distance from the specified point will be removed from the dataset. By default, all remaining points are sorted so that points closer to the center appear earlier in the output file. @@ -1662,55 +1714,52 @@ By default, all remaining points are sorted so that points closer to the center Per impostazione predefinita, tutti gli altri punti sono ordinati in modo che i punti più vicini al centro vengano prima nel file di destinazione. - + Radius Raggio - + Maximum distance from center. Distanza massima dal centro. - + Miles Miglia - + km km - + Lat. Lat. - + Latitude of the central point in decimal degrees. South latitudes should be expressed as a negative number. Latitudine del punto centrale in gradi decimali. Le latitudini dell'emisfero sud vanno inserite come un numero negativo. - + Long. Long. - + Longitude of the central point in decimal degrees. West longitudes should be expressed as a negative number. Longitudine del punto centrale in gradi decimali. Le latitudini dell'emisfero occidentale vanno inserite come un numero negativo. - - This filter sorts waypoints into alphabetical order - Questo filtro ordina i punti di interesse in ordine alfabetico + Questo filtro ordina i punti di interesse in ordine alfabetico - Sort - Ordina + Ordina diff --git a/gui/gpsbabelfe_ru.qm b/gui/gpsbabelfe_ru.qm index 480cf4b33..fdc32ae43 100644 Binary files a/gui/gpsbabelfe_ru.qm and b/gui/gpsbabelfe_ru.qm differ diff --git a/gui/gpsbabelfe_ru.ts b/gui/gpsbabelfe_ru.ts index ece776248..c5b81ea83 100644 --- a/gui/gpsbabelfe_ru.ts +++ b/gui/gpsbabelfe_ru.ts @@ -855,49 +855,54 @@ This program cannot continue. Форма - + Misc. Filters Прочие фильтры - + Nuke (Remove) Data Types Очистить типы данных - + + - Routes Маршруты - + + - + - Tracks Треки - - + + + - - + Waypoints Маршрутные точки - + Convert routes, waypoints and tracks to different types. Преобразование маршрутов, маршрутных точек и треков в различные типы. - + + Sort Routes + + + + This filter can be used to convert GPS data between different data types. Some GPS data formats support only some subset of waypoints, tracks, and routes. The transform filter allows you to convert between these types. For example, it can be used to convert a pile of waypoints (such as those from a CSV file) into a track or vice versa. @@ -906,40 +911,87 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes. Некоторые форматы данных GPS не предоставляют полную поддержку маршрутных точек, треков и маршрутов. Фильтр трансформации позволяет переводить данные между этими типами. Например, он может быть использован для конвертации точек (например из CSV файла) в трек и обратно. - + Transform Трансформация - + Type of transformation. Тип трансформации. - + Delete original data after transform to prevent duplicated data. Удалить исходные данные после преобразования с целью предотвращения дублирования. - + Delete Удалить - + + + + By + + + + + + + Description + + + + + GCID + + + + + + + Name + + + + + Time + + + + + Sort Waypoints + + + + + + Number + + + + Swap Longitude and Latitudes for badly formatted data formats. Поменять местами долготу и широту для неправильно сформатированных форматов. - + Simple filter to swap the coordinate values (latitude and longitude) of all points. This can be helpful for wrong defined/coded data. Or if you think, you can use one of our xcsv formats, but latitude and longitude are in opposite order. Простой фильтр для cмены местами координат (широта и долгота) всех точек. Может быть полезен для неправильно заданных/закодированных данных. Можно также использовать один из xcsv форматов, указав широту и долготу в обратном порядке. - + Swap Coordinates Поменять координаты местами + + + Sort Tracks + + OptionsDlg @@ -1458,49 +1510,49 @@ This option computes (or recomputes) a value for the GPS heading at each trackpo UpgradeCheck - - - + + + HTTP - + Unexpected reply. - + Download failed: %1. Загрузка завершилась неудачей: %1. - + Download failed: %1: %2. - + Error Ошибка - + Invalid return data at line %1: %2. Некорректные данные возвращены в строке %1: %2. - + A new version of GPSBabel is available.<br />Your version is %1 <br />The latest version is %2 Доступна новая версия GPSBabel.<br />Используемая версия %1 <br />Последняя доступная версия %2 - + Upgrade Обновить - + Do you wish to download an upgrade? Загрузить обновление? @@ -1541,32 +1593,32 @@ This option computes (or recomputes) a value for the GPS heading at each trackpo Форма - + Waypoints Filters Фильтр Маршрутных точек - + Remove duplicates Удалить дубликаты - + The duplicate filter is designed to remove duplicate points based on their short name (traditionally a waypoint's name on the GPS receiver), and/or their location (to a precision of 6 decimals). This filter supports two options that specify how duplicates will be recognized, shortname and location. Generally, at least one of these options is required. Фильтр дубликатов предназначен для того, чтобы убирать дублирующиеся точки используя информацию о их которком названии (обычно имя точки на приёмнике GPS), и/или их местоположении (с точностью до 6 знаков после запятой). Этот фильтр поддерживает две опции, которые указывают сколько дубликатов будет распознано, имя и местоположени. Обычно необходимо указать по крайней мере одну из этих опций. - + Duplicates Дубликаты - + Suppress duplicate waypoints based on name. Предотвращать дублирование маршрутных точек с одинаковыми именами. - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1581,17 +1633,17 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Этот параметр чаще всего используется с фильтром дубликатов. Он говорит фильтру убирать все точки, имеющие такое же имя, как и рассматриваемая точка. Может быть использован, чтобы удалять дубликаты при объединении двух наборов данных, созданных на основе общего источника.</p></body></html> - + Short Names Короткие имена - + Suppress duplicate waypoint based on coords. Предотвращать дублирование маршрутных точек с одинаковыми координатами. - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1606,17 +1658,17 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Этот параметр говорит фильтру дубликатов убирать любые дополнительные точки, имеющие такие же координаты (до 6 знаков после запятой) как и рассматриваемая точка. Может быть использован для очистки дубликатов, имеющих разные названия. Также может быть полезен вместе с параметром очистки по <span style=" font-family:'Courier New,courier';">именам</span>, чтобы удалять дубликаты, если имена нескольких несвязанных групп точек могут быть одинаковыми. </p></body></html> - + Locations Наложение - + Remove points based on proximity Удалить точки, исходя из оценки их близости - + Maximum positional distance. This option specifies the minimum allowable distance between two points. If two points are closer than this distance, only one of them is kept. @@ -1625,32 +1677,32 @@ This option specifies the minimum allowable distance between two points. If two Этот параметр определяет минимально допустимое расстояние между двумя точками. Если две точки ближе, чем это расстояние, одна из них удаляется. - + Position Положение - + Maximum positional distance. Максимальное позиционное расстояние. - + Feet футов - + Meters м - + Include points only within radius Включать точки в пределах указанного радиуса - + This filter includes or excludes waypoints based on their proximity to a central point. All waypoints more than the specified distance from the specified point will be removed from the dataset. By default, all remaining points are sorted so that points closer to the center appear earlier in the output file. @@ -1659,55 +1711,52 @@ By default, all remaining points are sorted so that points closer to the center По умолчанию все оставшиеся точки отсортированы таким образом, что точки, расположенные ближе к центральной точке, будут идти первыми в выходном файле. - + Radius Радиус - + Maximum distance from center. Максимальное расстояние от центра. - + Miles миль - + km км - + Lat. Широта - + Latitude of the central point in decimal degrees. South latitudes should be expressed as a negative number. Широта центральной точки в десятичных степенях. Южные широты должны быть выражены отрицательным числом. - + Long. Долгота - + Longitude of the central point in decimal degrees. West longitudes should be expressed as a negative number. Долгота центральной точки в десятичных степенях. Западные долготы должны быть выражены отрицательным числом. - - This filter sorts waypoints into alphabetical order - Данный фильтр позволяет отсортировать маршрутные точки в алфавитном порядке + Данный фильтр позволяет отсортировать маршрутные точки в алфавитном порядке - Sort - Сортировать + Сортировать diff --git a/gui/setup.iss b/gui/setup.iss index 5b6b63e75..879dfa740 100644 --- a/gui/setup.iss +++ b/gui/setup.iss @@ -20,7 +20,7 @@ ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017} AppName=GPSBabel -AppVerName=GPSBabel 1.6.0-beta20190413 +AppVerName=GPSBabel 1.6.0 AppPublisher=GPSBabel AppPublisherURL=http://www.gpsbabel.org AppSupportURL=http://www.gpsbabel.org @@ -28,8 +28,8 @@ AppUpdatesURL=http://www.gpsbabel.org DefaultDirName={pf}\GPSBabel DefaultGroupName=GPSBabel OutputDir=release -OutputBaseFilename=GPSBabel-1.6.0-beta20190413-Setup -OutputManifestFile=GPSBabel-1.6.0-beta20190413-Manifest.txt +OutputBaseFilename=GPSBabel-1.6.0-Setup +OutputManifestFile=GPSBabel-1.6.0-Manifest.txt SetupIconFile=images\babel2.ico Compression=lzma SolidCompression=yes